Fixed more logic, flush