Committing billy's changes. May or may not blend.