Upgraded Beta Handling