re-arrange & enhance: abhinav