Updated with proposal 1

From #349