Change: more checks