Work on Swing now