as much changes done as I could do :P