Process logics
Merge fix