Changed to using proxy instead of redirect