working on Javier s comments
new version finished