added new checks and url args