Adjustments in the code