parse features added but not tested + refactoring