fixing items 8, 9, 10 & 11 @Home