Merged back changes from presentation