Feature/reconfig code 15