minor changes so the site don't echos a lot