final draft proposal with all suggested changes in properties/classes