changed to a hash, faster?