changed names of classes and general behaviour