Reintroducing notes; better braces handling