modified classes and added some static classes