(fix) adapt and fix code to mark's review