Factory limit: added the necessary variables
Factory limit is done (but could be tested more)