added some testing features
updating version two to master