More work on changing base template