Improves KnightOS/KnightOS#212