Changed wav and master to work together