yotam: Stable sub-version with last improvments