added little modifs