added some redirecting