added Kailie's suggestions