preperation for serialization
Merge conflicts resolved