more work on Swing