TODO 3 & 4 for commenting