Updated with changes between 1.0 and 1.2