Update Master to reflect new changes