Updated with corrections