Removed wait
Minor updates