Minor Modifications to redirect