changed the order of fileds