modified files to be compatible with 5.3