Added code to call finish