Added comments and next TODO