Minor modifications;