Updated Basic Template