finishing up Silva merge