Added comments and updated base