added shifts back in, they are broken