Works better on project switch now