MAINT: more modifications