merged jens repos into mine