some expermental code removed for rc2