Improvements and accordion pattern