Major restructor and improvements