Adjusted everything