Epnp works!
small changes