Added up to ex 1.16