Martin rework

Martin rework