Completing beta functionalities
Completing beta functionalities