2013-11-09 improvements