markup.prepare rework