patches from 1.2 exercise added