updated with latest from LRP