All the changes with Marshal and UnMarshal working