updated full proposal