Add more message, add debug mode