Added suggestions from MANCHUCK