imran| 0000|some refactor code