chnged for error
errros corrected; milestone: HW part1