fixed all andy issues - not all most