Added staccato and with function