Updated to use full design list