praveen|fixing bug with create orders/refactoring