Added beta code for future.