Updated inventory

updated the inventory and merging into master