Changes suggested by Asmorkalov