Fixed up user helper functions