some default values removed, some waits