Updated from Previous design