merge work from andi