enhance producer logic

enhance producer logic