Version 3

New additions some clean up