Added checks and URL parameter.