Changed URL and proper parsing for it