Adds additional steps and path switching