GUI-class changed a bit