added new sections
fixed merge