Improve swing ext