Updated Struct Code