changed function names following James' name changes