and removing datashift again