Nirav's Changes to merge with personal branch
fixed merge conflicts