Design improvements #2