Huge patch; loads added & wave system