updates for latest changes