Updated to new 3.3.6 files