Edited for extra hashes