Some modifications for over the weekend for the user and note models