Refactored beta