cleared up the accordion mess a little