Debugged very fast

Not sure if it's working or not...