Removal of needles complexity and comment add