before bugs
merg