Title: A Revision of Demand Theory