moment utilization
options test
appropriate fixes