GMW improvements