Removed annoying wait function