Debugged product-procedures have been added