Now includes after calculation