implement marvin's suggestions