Debugged the latest version