wish saving fixed + serializer updated