First complete revision