Extra spec, better redirect handling