<unfortunately I forget what I did here>
Previous commit was an error - this is current working state