Finalizing the code, changing the argument names and capability 
attribute names