Assessment transient again
Refactor