Major improvements
notes enabled