Fixed fire message + added ToDo