Trying to get second wave working...