Client side re-do, 20140912
 - Build ok!