Optimizing console-version