Marking as beta like it should have been