Adjusted for console usage