New version

Changed after first review