testing and improvements