Changing the serializer phase 3
Merge