re-doing my changes from last night