Added locations and counter (smokes)