Changed a bit the code...