Changed way to calculate price