before andys merge