applied 1.8.2 files