huge changes going on, NOT WORKING