CS for hathor

@Bakual i can revert it. And we fix it with a other PR @wilsonge ?