source updated for ex 1.1 and 3.1