few more suggestions from @kubes