Clean up and Liquid ME added