pulled latest changes from lnwdr