repaced some classes with doubles