A lot of changes made