PR for code review

Done na po.