Code Adjustments