Converted everything to AWT