Nipple enhanced version - v1.0