Updated to 1.7.8 Code