Imroved code