Preperation for first integrated version