tidy up - not tested redirct yet