Feature/improve zen