Updates reflecting new functionality
Implmented on Angular.