working on new pop and crit features