Updated design and code