minor revisions(still needs some organization)