Production code from client from 2013-08-13