Started migrating to new site
Fixed code to match testcases