Changed the FindProductState call and little housekeeping.