Added some waitforstart for comp and other comp stuff