exceptions changed
fixed changes