a lot of changes have been done