some little modifs