Remap command issues

ohk will reduce things down and then try again