Mavenize attempt 3