Lots of changes and redirections