merged shah and andrew