Removed wait def