Adding all changes that got missed in the last commit