Added checks
enhanced it to grade url
minor changes