Transient fixed and improvements