Updating source to CalSPEED v1.2