Worked on entry save functionality