Sept23 bug fixes normal code