actionmap improvement