added conditional panels