Fix transition (works but not finished)