Improved accordion update somewhat