Updated To not rely on .htaccess files