added wave feature, modified squeeze feature