zomg lots more changes