Added more norifications