removed the quantity field in the main loop
and the version