FIXED TEH CODE