changes based on discovery by Olga and Ed