Changing the serializer phase 2