refactoring plus re_axing of prices