Good call, will change to use map