Added stricter rules