fixed ex 1 and 2