made some more changes to test1 branch