Added public and private notes and logic to make it work