user refactor under way, fixed enum