added option parsing back in