90% modify commodity
deal conflict
beta veistion 99% complete