Final (hopefully) changes to beta