Adjusted behaviour