End: Fixed full main option