moved more options from code to run