moved around some attr