Fixes to proposal after meeting with Tobias