Updated with merged oeaks