removed redirect as it breaks too many things