Incorporated changes from presentation branch