lot of changes made on local machine