Options improvement