andy's changes working