Fixed issue with changing intensity
Updated emo logic and based