Version 2.5 Update

Code Trimmed + Removed unnecessary Callings