added conditional info