more work on swing