notification and validation final fix