moving to ocal logic
merging