doing some rearangements