refactor Parsiraj