WIP:addded waves picker