updated for more testing
updating to master