first working implementation of MARMOTTA-536