Unfinished Rework of Custom Update