Updated

Added methods from HW-18b