Design fixes
trying to fix average_price