Add a Proper Finish Event