Add more effects
remove conflict