Really should have thought through the last field update. This should be better