accomodated changes from glabstraction