convert to dynamic condition, removed 2 lines