Trying to fix the latest differences between code