adding more changes from @Alxandr - thanks