adding some code for 2nd time
fixing conlict