slight change based on Cris's suggestions