lot of changes made