trying to fix new code