change alert message and add comments