Mavenize attempt 4