Added some commenting