Added to more potential features