more @ajpiano changes