after all commit problem this is real updated code