Nail: Implemented desired changes defined during the last meeting.