Various changes and improvements on new system