No longer contains function calls that are out of CS31 scope