have new functionality working