fixed notes, two components working