Move update to individual part on click listener