added datastructure defaults
use the right api… again