updated to new format, tried the combined features approach