Added some extra wave features yaay