Make changes from shakira