might as well call this version 2.1--Major update