Fixed all the changes