maint - updated per comments