Ugly commit. just synchronziation to jakob