Added some stuff and trying to have some tvars