Done with revision B