Simpler packaging