Added needle value handling