Temp changes

Exception changes