beta feature [DO NOT MERGE]