added some functions + adaptations to wrappers