updating to work with new datalayer