Did not commit all changes last time. This commit contains all the changes intended for the last commit.