Merge effects

Update effects