Updated design after spec