tweaked conditions for new indicators