adding changes from fabricio