final commit - merging sathish's code