Fix Bug and add Speciality