intermediate: nominal ok
fix issues