merged fernandodo p's clarifications