Minor modifications~