Made changes suggested by George regarding boolean and other
commit adding of renamed class