Overall Improvement | Still converting to C#