updating stuff after the last merge
2 files changed