implement comments from pfalabella