A lot of changes and improvements