updated for changes told by sandeep