Revision 4

Redid some shit