Modified with calculating the price