Bharti| #1320 Refactoring and Fixing chain overlap with current order