Clear out Part 2 (EDIT-ebaron spiral and Zmax reduced price)

completed