migrated to kepler
renamed feature
minor refactorings