working on the code...