Nipple enhanced version - v2.0