a few more modifs