Debug breaks are now down 1 level higher on the stack
Cleaned up code by removing scaling (for now)