before merging shomari