Software modernization

Problem solve