trying to fix shift issues