Rework of Custom Update