Added more code/comments