Fields moved and moved back again - View it on GitHub