changes and improvements