update - general changes for new functionality