Some reerangeing