Edited first proposal