Organised field updates into functions