nchurdamz updates
bring into line with cass79
yup