minor chnages + realigned fields