Removed On Update breaking, started converting to grid.