rearranging for new redirect