Adding Yu's features