Merged design and server-side