Debugging 2

Lots of debugging :)
Debugging 2