Updated beta from davis-dev