Completely re-based shakira build