changed to hash format
hash array conflict fixed