Rewrite a little and add notes