added from earlier changes