updates due to request from User:Kaganer