Updated

Finished changes from last night