Simple impl of #7