minor changes again, hard work here!!!