Beta

Changes accepted.