Updated with add more button