few more modification