merge Amisha's blessed_sites changes