Fixed Issue #40, #50. Designing task and charge of a certain order over again.