Added Daniel Pao's fork changes