change naming and update dims