improvements on Interprete
merge conflit