MainWorkPart1 improved