Improve closing options