changed location of assignments