[Jackie] Merged with Shulin's Frontpage Code