even more hacky but eh
merge