Finished revision 1