Reorganise to have a simple example