many rules into one for #PEL- 77, #PEL- 112, #PEL- 113,#PEL-  115 (master branch)