tweaking option mapping