Adding versioning and markers from earlier.