some changes to include elasticsearch
aa