Debugged and commented