Vitor's initial version