Updated according to comments from Shijia Li