Can you extract those new added lines to a separate method in order to not overload the context of the stop method?