Implmented Wan's updated design