Updated beta with last changes