Mods to be enable error analysis