Patched in some waitons stuff