debug
debug
Refactored for custom REST class