Pub - change the close event to end, Sub - change the close method to end