added property checking to hash (currently commented out)