add rest of 1.2