Integration with new design (not tested)