Add some more end behavior