updated all the stuff