#16 Min changes and coverage improvement