Some notes for future changes