Better function names, but still totally broken!