More updates and added urlencode