* more work on the condition
* small changes serialization