Added notes & logging