god only knows
merge, testing fix up