Removed timer, use wait()