committing some of Tyler's changes