addressed comments from @mehlis