fixed and add functionality
saved