Updated to latest hamlet