modernized code