Completed Conversion to 1.4.7