few more modifications before done