changed to use option mapping