adapted all contructors to changes