Got changing base functionality to work