some little modifi