Updated design/system