Added CS 225 and tweaked json format