updates from previous changes