Added new finish after method and changed location on finish calling to better match timing