First version completed
small changes