removed too complex logic - we know what we want and so added simple templating