removed some more default values