Some modernization