few modificaion