new last min fixes