Works better, notes are still wrong though