use arrays instead of hashes
include the old version too