final tweak before merge with master