#5181 | Replacing old investigation with new one