updated all stuff