FIXED: 11.2 compatibility, code base rewrite