Added check for windowed system for command line system