2nd wave, bug fixing