minor improvement on contacts