11/30/14 (better param validation)