refactored to use felix bundle plugin