another commit with fixing names problem