New version debugged