Updating structure, functions