Andy S changes