Improving code in preparation for force flag.