New implm

old methods deprecated
Removed tests(!)
Improved new implementation