Cleaned up for release 3
v.4