removing extra code...working hard