committing nearly final version