initial re-commit with Lanyon