Added KeyboardInterrupt