revised for maven distro