Putting my structural changes back in.