Adding default to not have mode, like before