added secondary checks