Modify message
Added alerts, not tested yet