Added other checks