Setup for future redesign