updated cheat sheet/mapping