Added map to web, wait() added