modification for fixing options. Please have a patient and carefull look on this