Marged and personal file change

Updated my scene to latest