updated current serializers, there is a much easier and better solution for serializers