refactored params for puzzle handler
adding rest units