Goals and penalties thread safety increased