Updating Dam branch to newest version