Implemented Cassie's suggestions