Re-arranged fields according to follow-up