rework later for Nichole