Feature/investigate transition slow