reorganising option creation