Tried to improve closing