Optimalized the no application conditions