Changed the inner workings of feature a little bit