Legacy system modernization

shape