Adjusted initialization