add serializable
merge conflicts