Debugged further