for 3.0beta (incomplete)