2.0beta merged with remote