Updated design and changed timeline