Updated dorh -- still not great though