changed to use 6 features