changed to reflect ccny stuff