finishing new serializer branch