add code reworked and further progressed for 922 project