Adjusted setup