Changed from AWT to Swing ;)