merged with jens