updated all the stuffs