Update #13 compute on load