improved skin handling