updated to the same as merlins git