Cleaned up; good commit
New version, happy happy REV 40