Adding all the changes tested today