Updated Basic Design