updated for data location