add few more modification