Updated Needle functionality