Notes saving mechanism changed