updated code for all section