improved accordion and removed merge conflicts