merge andy's demo