first modifications for my needs ( no vim )