merging code from test and test1 into index