Reverted to fix format. Fixed routing and redirecting.