Added condition switch