changes based on code review from @snej