changed to "beta"-flag
style changes