David template fix v1 - Nov 7, 2013