Add timeout that doesn't really work?