cleaned up process of feature capture