Added alert and notice