update change me with the scaffold changes