Further work on SWT version