some of the properties and values got lost with the last PR. Next attempt