rewrite conclusion
last fixes