LL-240
* re-factoring for respective issue