Improvements. Disabled Dev Mode