Change According to Playtest
merge