Justo Vargas - Added minimal funtionality