some improvemets over the last commit…