Updated proposal 2