Changed logic in the comp control sections