Changed add substitions to spaces