feedback from @derekbrown applied