Updated working structure.