Chethan,D3| #693 | Conditional provision, refactoring