Added URL drop, cleaned code