Merging dev to getting data