Changed where attributes were being assigned