Added part of the comments + potential bug fix