Rework, add some notes