add other checks