This is better. Will change all the log message later.