Commited the rest of the changes (forgot)