Add working version for notes and calendar