Added carrier wave functionality