additional rework of code