Option maker improovement