updating to sync up with psd (wip)