Add lwrp and testing part