more simplify on 7.21