LWR added
functions renamed