tested and approved functionality, to do next check merge