Added trough and fixed bug with serializiation