updated to reflect hayley's changes