Updating for fabio. Added new option.