Before getting rid of using "actual pieces" in wave building