deleted and rearraged