Updated proposal after receiving comments