major changes 3

DEADLINE IS COMING :(