last changes to code