Final version

finishing touches