Continued work on LWRP