[Core] Maybe this will work a little