just a bit more on trying to finalize code