Vanilla update, minor customizations