new changes on Maksim branch