Add clw back in