got rid of feature creep