Improve handling of emission, AFX density