updating code to match lwrp hierarchy