refactor helper for production
reverse action
refactor helper for production