Added additional comments and stuff