Preparing for master merging. Took out the testing.